# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/06/16 10:30:39-06:00 bjorn.helgaas@hp.com # Merge hp.com:/home/helgaas/linux/to-marcelo-2.4 # into hp.com:/home/helgaas/linux/linux-ia64-2.4 # # include/linux/pci_ids.h # 2004/06/16 10:30:35-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # drivers/char/Makefile # 2004/06/16 10:30:34-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # Makefile # 2004/06/16 10:30:34-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # ChangeSet # 2004/06/16 10:28:33-06:00 eranian@hpl.hp.com # [PATCH] ia64: fix info in /proc/pal/*/bus_info # # This patch fixes to minor bugs: # - corrected descriptions for bit 52 and 53 of the /proc/pal/CPU*/bus_info # entry; they were swapped # - corrected a typo for bit 55 of the /proc/pal/CPU*/bus_info entry # # Signed-off-by: Stephane Eranian <eranian@hpl.hp.com> # Signed-off-by: David Mosberger <davidm@hpl.hp.com> # Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> # # arch/ia64/kernel/palinfo.c # 2004/06/16 10:25:13-06:00 eranian@hpl.hp.com +2 -2 # ia64: fix info in /proc/pal/*/bus_info # # ChangeSet # 2004/06/16 11:15:51-03:00 david-b@pacbell.net # [PATCH] EHCI fixes (byteswap, BIOS) # # Stuart Hayes here at Dell has identified this or/and mix-up in the # ehci-hcd driver. Because of this, ehci-hcd is not properly released by # BIOSes supporting full 2.0 and port behavior can then become erratic. # # (Code predates general availability of such BIOS firmware.) # # From: Gary Lerhaupt <Gary_Lerhaupt@Dell.com> # Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> # # Add missing byteswap so that interrupt transactions work (MIPS/uClinux). # # From: Rick Sewell <rsewell@cableone.net> # Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> # # drivers/usb/host/ehci-sched.c # 2004/06/15 11:16:24-03:00 david-b@pacbell.net +1 -1 # EHCI fixes (byteswap, BIOS) # # drivers/usb/host/ehci-hcd.c # 2004/06/15 11:16:14-03:00 david-b@pacbell.net +1 -1 # EHCI fixes (byteswap, BIOS) # # ChangeSet # 2004/06/16 10:55:55-03:00 nuno@itsari.org # [PATCH] Fix rwsem-fix typo # # # lib/rwsem.c # 2004/06/16 10:14:29-03:00 nuno@itsari.org +3 -2 # Fix rwsem-fix typo # # ChangeSet # 2004/06/15 20:47:37-07:00 davem@nuts.davemloft.net # [SPARC]: Report si_addr in SIGINFO more accurately. # # arch/sparc64/mm/fault.c # 2004/06/15 20:47:25-07:00 davem@nuts.davemloft.net +11 -4 # [SPARC]: Report si_addr in SIGINFO more accurately. # # arch/sparc64/kernel/unaligned.c # 2004/06/15 20:47:25-07:00 davem@nuts.davemloft.net +2 -2 # [SPARC]: Report si_addr in SIGINFO more accurately. # # arch/sparc/mm/fault.c # 2004/06/15 20:47:24-07:00 davem@nuts.davemloft.net +23 -4 # [SPARC]: Report si_addr in SIGINFO more accurately. # # arch/sparc/kernel/unaligned.c # 2004/06/15 20:47:24-07:00 davem@nuts.davemloft.net +4 -4 # [SPARC]: Report si_addr in SIGINFO more accurately. # # include/linux/pci_ids.h # 2004/06/15 12:20:43-03:00 marcelo@logos.cnet +4 -0 # Import patch parport # # drivers/parport/parport_pc.c # 2004/06/15 12:13:25-03:00 marcelo@logos.cnet +17 -0 # Import patch parport # # drivers/parport/ChangeLog # 2004/06/15 12:13:25-03:00 marcelo@logos.cnet +9 -0 # Import patch parport # # drivers/char/parport_serial.c # 2004/06/15 12:13:25-03:00 marcelo@logos.cnet +14 -4 # Import patch parport # # drivers/parport/Makefile # 2004/06/15 12:13:20-03:00 marcelo@logos.cnet +0 -1 # Import patch parport # # drivers/char/Makefile # 2004/06/15 12:13:20-03:00 marcelo@logos.cnet +1 -0 # Import patch parport # # drivers/char/ChangeLog # 2004/06/15 12:13:20-03:00 marcelo@logos.cnet +5 -0 # Import patch parport # # ChangeSet # 2004/06/15 12:07:35-03:00 marcelo@logos.cnet # Michael Reinelt: Add support for NetMos 9835 serial cards # # ChangeSet # 2004/06/15 10:47:28-03:00 marcelo@logos.cnet # Changed EXTRAVERSION to -pre6 # # Makefile # 2004/06/15 10:46:57-03:00 marcelo@logos.cnet +1 -1 # Changed EXTRAVERSION to -pre6 # # ChangeSet # 2004/06/14 16:19:17-07:00 Andrej.Filipcic@ijs.si # [PATCH] USB: pl2303 & input overruns # # Backport the 2.6 fixes for handing overruns and other status reports # from the device. # # drivers/usb/serial/pl2303.c # 2004/05/19 13:47:04-07:00 Andrej.Filipcic@ijs.si +7 -1 # USB: pl2303 & input overruns # # ChangeSet # 2004/06/14 16:19:06-07:00 martin.lubich@gmx.at # [PATCH] USB: add Clie TH55 Support in visor kernel module # # Based on the patch that is currently in 2.6 # # drivers/usb/serial/visor.c # 2004/04/22 12:45:02-07:00 martin.lubich@gmx.at +97 -1 # USB: add Clie TH55 Support in visor kernel module # # ChangeSet # 2004/06/14 16:08:48-07:00 greg@kroah.com # USB: fix empty write issue in pl2303 driver. # # Patch originally from Christian Groessler <cpg@aladdin.de> but cleaned up # by me. # # drivers/usb/serial/pl2303.c # 2004/06/14 09:08:44-07:00 greg@kroah.com +3 -0 # USB: fix empty write issue in pl2303 driver. # # Patch originally from Christian Groessler <cpg@aladdin.de> but cleaned up # by me. # # ChangeSet # 2004/06/14 16:07:03-07:00 jan@ccsinfo.com # [PATCH] USB ftdi device ids for 2.4 # # drivers/usb/serial/ftdi_sio.h # 2004/06/14 09:06:52-07:00 jan@ccsinfo.com +5 -0 # [PATCH] USB ftdi device ids for 2.4 # # drivers/usb/serial/ftdi_sio.c # 2004/06/14 09:06:52-07:00 jan@ccsinfo.com +7 -0 # [PATCH] USB ftdi device ids for 2.4 # diff -Nru a/Makefile b/Makefile --- a/Makefile 2004-06-16 10:58:03 -07:00 +++ b/Makefile 2004-06-16 10:58:03 -07:00 @@ -93,6 +93,7 @@ CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ -fno-strict-aliasing -fno-common +CFLAGS += -g ifndef CONFIG_FRAME_POINTER CFLAGS += -fomit-frame-pointer endif @@ -307,8 +308,7 @@ $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in xconfig: symlinks - $(MAKE) -C scripts kconfig.tk - wish -f scripts/kconfig.tk + @echo -e "***\n* Sorry, xconfig is broken; use \"make menuconfig\" instead.\n***" menuconfig: include/linux/version.h symlinks $(MAKE) -C scripts/lxdialog all diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h --- a/include/linux/pci_ids.h 2004-06-16 10:58:03 -07:00 +++ b/include/linux/pci_ids.h 2004-06-16 10:58:03 -07:00 @@ -2029,8 +2029,12 @@ #define PCI_DEVICE_ID_HOLTEK_6565 0x6565 #define PCI_VENDOR_ID_NETMOS 0x9710 +#define PCI_DEVICE_ID_NETMOS_9705 0x9705 #define PCI_DEVICE_ID_NETMOS_9735 0x9735 +#define PCI_DEVICE_ID_NETMOS_9805 0x9805 +#define PCI_DEVICE_ID_NETMOS_9815 0x9815 #define PCI_DEVICE_ID_NETMOS_9835 0x9835 +#define PCI_DEVICE_ID_NETMOS_9855 0x9855 #define PCI_SUBVENDOR_ID_EXSYS 0xd84d #define PCI_SUBDEVICE_ID_EXSYS_4014 0x4014